From: Lukas Schmelting <lschmelting@posteo.com>
Date: Thu, 27 Nov 2025 22:58:32 +0000 (+0100)
Subject: screenShield: Avoid unfocused authentication view after resume
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~55^2^2~21
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=c9eff24f401368f9251b40ef7aba8f1144284b5e;p=gnome-shell.git

screenShield: Avoid unfocused authentication view after resume

When suspending on the authentication page of the lock screen in a user
session, the session resumes with the authentication dialog shown but
its password entry field unfocused. Instead, focus moves to the
authentication dialog itself while _ensureUnlockDialog() in
screenShield.js is called on resume.

Avoid this edge case by switching to the clock view instead before
suspend, which also provides a more consistent user experience.

Co-authored-by: Florian Müllner <fmuellner@gnome.org>
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3962>
(cherry picked from commit 4bfa300850045dcd7c974bdd128adef13f2777b1)
---

diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index c4df1c208..63b9ca5e9 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -244,6 +244,7 @@ export class ScreenShield extends Signals.EventEmitter {
 
     _prepareForSleep(loginManager, aboutToSuspend) {
         if (aboutToSuspend) {
+            this._dialog?.cancel();
             if (this._settings.get_boolean(LOCK_ENABLED_KEY))
                 this.lock(true);
         } else {